From: Rob Browning <rlb@defaultvalue.org>
Date: Mon, 25 Aug 2025 00:58:30 +0000 (-0500)
Subject: Adjust shr-tests/zoom test to work with libxml2 2.14+
X-Git-Tag: archive/raspbian/1%30.2+1-2+rpi1^2~12
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22bookmarks:/%22/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22?a=commitdiff_plain;h=a891bf1e7da05bf50948410aaebc64459ffbf56c;p=emacs.git

Adjust shr-tests/zoom test to work with libxml2 2.14+

Add 0023-test-lisp-net-shr-tests.el-shr-test-zoom-image-Fix-i.patch to
address the issue. Thanks to Matthias Klose for reporting the problem.

Closes: #1106354
---

a891bf1e7da05bf50948410aaebc64459ffbf56c
diff --cc debian/.git-dpm
index 0b640384571,00000000000..b34fd899e79
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 52a49907e53a0f4f484e0759ae317fd728f12153
- 52a49907e53a0f4f484e0759ae317fd728f12153
++0ba136caed372eb8eb963b2a421f944f4671ddec
++0ba136caed372eb8eb963b2a421f944f4671ddec
 +c512c0fa6ab117d10b0602d2b2d1fe5880695944
 +c512c0fa6ab117d10b0602d2b2d1fe5880695944
 +emacs_30.1+1.orig.tar.xz
 +09c8a2c6420edf1c0eafbe02c108fdaaf9d3a105
 +31081984
diff --cc debian/patches/0023-test-lisp-net-shr-tests.el-shr-test-zoom-image-Fix-i.patch
index 00000000000,00000000000..d151f47a253
new file mode 100644
--- /dev/null
+++ b/debian/patches/0023-test-lisp-net-shr-tests.el-shr-test-zoom-image-Fix-i.patch
@@@ -1,0 -1,0 +1,38 @@@
++From 0ba136caed372eb8eb963b2a421f944f4671ddec Mon Sep 17 00:00:00 2001
++From: Eli Zaretskii <eliz@gnu.org>
++Date: Thu, 17 Jul 2025 19:34:50 +0300
++Subject: ; * test/lisp/net/shr-tests.el (shr-test/zoom-image): Fix <img>
++ (bug#79041).
++
++(cherry picked from commit 462a541db904405ede8446c48ba0c71ad41c544d)
++
++README-Debian: The shr-test/zoom image test should now work with libxml2 2.14+
++ .
++ This upstream patch has been added to fix the problem:
++ .
++ commit 462a541db904405ede8446c48ba0c71ad41c544d
++ Author: Eli Zaretskii <eliz@gnu.org>
++ Date:   Thu Jul 17 19:34:50 2025 +0300
++ .
++    ; * test/lisp/net/shr-tests.el (shr-test/zoom-image): Fix <img> (bug#79041).
++Bug: https://debbugs.gnu.org/79041
++Bug-Debian: https://bugs.debian.org/1106354
++---
++ test/lisp/net/shr-tests.el | 4 ++--
++ 1 file changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/test/lisp/net/shr-tests.el b/test/lisp/net/shr-tests.el
++index 8d66684c96d..4978db27df5 100644
++--- a/test/lisp/net/shr-tests.el
+++++ b/test/lisp/net/shr-tests.el
++@@ -145,8 +145,8 @@ shr-test/zoom-image
++     (dolist (alt '(nil "" "nothing to see here"))
++       (with-temp-buffer
++         (ert-info ((format "image with alt=%S" alt))
++-          (let ((attrs (if alt (format " alt=\"%s\"" alt) "")))
++-            (insert (format "<img src=\"%s\" %s" image-url attrs)))
+++          (let ((attrs (if alt (format " alt=\"%s\">" alt) ">")))
+++            (insert (format "<img src=\"%s\"%s" image-url attrs)))
++           (cl-letf* (;; Pretend we're a graphical display.
++                      ((symbol-function 'display-graphic-p) #'always)
++                      ((symbol-function 'url-queue-retrieve)
diff --cc debian/patches/series
index 147ee87103e,00000000000..1cae13241d7
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,22 -1,0 +1,23 @@@
 +0001-Prefer-usr-share-info-emacs.patch
 +0002-Run-debian-startup-and-set-debian-emacs-flavor.patch
 +0003-Remove-files-that-appear-to-be-incompatible-with-the.patch
 +0004-Adjust-documentation-references-for-Debian.patch
 +0005-Modify-the-output-of-version-to-indicate-Debian-modi.patch
 +0006-Don-t-try-to-build-src-macuvs.h-via-IVD_Sequences.tx.patch
 +0007-Kill-gpg-agent-in-package-test.el-to-avoid-a-race.patch
 +0008-Mark-vc-bzr-test-fauilt-bzr-autoloads-as-unstable-fo.patch
 +0009-pdumper-set-DUMP_RELOC_ALIGNMENT_BITS-1-for-m68k.patch
 +0010-Mark-test-undo-region-as-unstable.patch
 +0011-Mark-flaky-test-process-tests-multiple-threads-waiti.patch
 +0012-Add-inhibit-native-compilation.patch
 +0013-Rename-to-inhibit-automatic-native-compilation.patch
 +0014-Patch-project-vc-recognizes-git-test-for-Debian-buil.patch
 +0015-Change-native-comp-async-jobs-number-default-to-1.patch
 +0016-Change-native-comp-async-report-warnings-errors-to-s.patch
 +0017-Mark-dired-test-bug27243-02-as-unstable-for-now.patch
 +0018-Fix-eldoc-warning-in-patch-adding-debian-emacs-flavo.patch
 +0019-Boost-BASE_PURESIZE-in-attempt-to-fix-build-on-32-bi.patch
 +0020-Disable-server-tests-server-force-stop-keeps-frames-.patch
 +0021-Disable-emacs-module-tests.el.patch
 +0022-Add-public-interfaces-for-accessing-builtin-package-.patch
++0023-test-lisp-net-shr-tests.el-shr-test-zoom-image-Fix-i.patch